Encryption component #11
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Development to main
Add NFT Tokens
Cleanup package.json
Revert "Cleanup package.json"
andreibancioiu
previously approved these changes
Jun 29, 2021
| import {v4 as uuidv4} from "uuid"; | ||
| const crypto = require("crypto"); | ||
|
|
||
| export class Randomness { |
There was a problem hiding this comment.
✔️ I confirm there's no change in the logic of this class (only move / refactor).
| @@ -0,0 +1,36 @@ | |||
| import scryptsy from "scryptsy"; | |||
|
|
|||
| export class ScryptKeyDerivationParams { | |||
There was a problem hiding this comment.
I confirm there's no change in logic - only movement & refactoring ✔️ (better cohesion now).
src/walletcore/userWallet.ts
Outdated
| private static generateDerivedKey(password: Buffer, salt: Buffer, kdfparams: ScryptKeyDerivationParams): Buffer { | ||
| const derivedKey = scryptsy(password, salt, kdfparams.n, kdfparams.r, kdfparams.p, kdfparams.dklen); | ||
| return derivedKey; | ||
| static ecFromJSON(keyfileObject: any): EncryptedData { |
There was a problem hiding this comment.
What does the prefix ec mean?
There was a problem hiding this comment.
It was a typo, should have been ed for "Encrypted Data"
| @@ -0,0 +1,22 @@ | |||
| import { assert } from "chai"; | |||
|
|
||
| const decipher = crypto.createDecipheriv(data.cipher, derivedKeyFirstHalf, iv); | ||
|
|
||
| return Buffer.concat([decipher.update(ciphertext), decipher.final()]); |
There was a problem hiding this comment.
So, the padding is still done in userWallet.ts.
I can confirm there's no change in logic - only refactoring ✔️
|
|
||
| export class Encryptor { | ||
| public static encrypt(data: Buffer, password: string, randomness: Randomness = new Randomness()): EncryptedData { | ||
| const kdParams = new ScryptKeyDerivationParams(); |
There was a problem hiding this comment.
I confirm the login here is the one from the previous constructor of UserWallet ✔️
AdoAdoAdo
approved these changes
Jul 1, 2021
andreibancioiu
approved these changes
Jul 1, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added new component for
EncryptedData.It uses the same key derivation mechanism as the account keyfile (in fact, that was refactored to use
EncryptedDataunder the hood which is more general-purpose).Link to component description:
https://docs.google.com/document/d/1Xxb39JJkf8B9UzzQZd3KeOzL6nomoOxOyxKpxDKRgiE/edit#